-
Notifications
You must be signed in to change notification settings - Fork 365
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add regionally-refined Eastern North Atlantic grid #1629
Conversation
@brhillman : one issue that was recently pointed out in another github issue: why are you adding defaults for the land model in the CAM defaults.xml file? I think this is probably a mistake. Can you remove them and see if this case still works? edit: actually - my mistake - the changes in the CAM defaults.xml in this PR may all be related to atmosphere? |
@mt5555 Ben did not put finidat values to cam default namelist, if this is what you are referring to. |
per @bishtgautam 's comment on #1612 these variables are CLM defaults and I suspect should not be in the CAM defaults XML file: It appears that components/cam/bld/namelist_files/namelist_defaults_cam.xml has: Following land-related entries: |
This PR doesn't add any land related entries in namelist_defaults_cam.xml. All land-related entries are added in namelist_defaults_clm4_5.xml. A different issue that I see with this PR is that both commits make changes to files inside and outside the cime directory. Commits need to be done all over again to ensure that a single commit only modifies files inside or outside the cime directory. |
after further review: my only concern for this PR is 'fsurdat'. Can you remove that from the CAM defaults XML file and see if everything still works? |
@mt5555 I set finidat and fsurdat in clm_namelist_defaults_clm4_5.xml. It does look like fatmlndfrc, and focndomain get set in cam_namelist_defaults.xml, along with the other domain files. This seems to be where they are set for all of the other grids though, even though they are also set in the config_grids.xml file in the top-level cime config. |
sorry - my mistake again. this PR looks good except for the CIME issues @bishtgautam pointed out. That this grid works confirms that fsurdat (and probably a few others) need to be removed for the other RRM grids from the CAM defaults XNL file. fsnow* variables seem to be used by both CAM and CLM, so they should be there. |
f3f11ac
to
80f7f75
Compare
Add support for enax4v1_enax4v1 and enax4v1_ne30_enax4v1 resolutions in cime.
Add horiz_grid entry for ENA to CAM configuration. Sets the grid name and size (number of columns).
Set dycore parameters and input data paths for CAM when the grid is ne0np4_enax4v1.
Configure CLM to run on new ENA grid. Set paths for initial condition (year 2000 conditions) and surface data in namelist defaults, and add ne0np4_enax4v1 to list of supported grids in namelist definitions.
80f7f75
to
27d0bb0
Compare
RRM grids using the se dycore should all start with ne0, but CAM_DYCORE was only set explicitly when the atmosphere grid started with ne[1-9]. Setting this to se when the grid begins with ne[0-9] sets CAM_DYCORE properly for all RRM grids. Fixes #1357.
Set ATM_NCPL in driver configuration when atmosphere grid is ne0np4_enax4v1.
@mt5555 FYI, it looks like fsurdat and finidat are set in the CAM defaults XML for more than just the RRM grids. I am cleaning up my commit history to separate cime and component changes and running a short test to make sure nothing broke, and I will let you know when this is ready. Thanks. |
@mt5555 @bishtgautam this should be cleaned up and ready now. |
Fix a couple pylint issues. Fix a critical problem in code_checker that caused it to filter too many files. Test suite: pylint, unit-tests Test baseline: Test namelist changes: Test status: bit for bit Fixes [CIME Github issue #] User interface changes?: None Code review: None
@mt5555 please start merging this. |
@mt5555 do I need to do anything further to get this ready to be merged? |
Add configuration for a new regionally-refined (ne30 to ne120) grid over the Eastern North Atlantic. All components run on the RRM grid (enax4v1). All needed input files to run the new configuration have been uploaded to the input data repository. Supported compsets include only FC5AV1C-04P2 (72 levels), but RTM needs to be turned off (xmlchange RTM_MODE=NULL). Fixes #1357 * brhillman/atm/add-ena-rrm: Set ATM_NCPL for ENA grid Set CAM_DYCORE to se for RRM grids Set CLM namelist definitions and defaults for ENA Set CAM namelist defaults for ENA grid Add ENA grid size to CAM configuration Add cime configuration for ENA grid
merged to next |
Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357.
Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357.
Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357.
Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357.
Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357.
Add configuration for a new regionally-refined (ne30 to ne120) grid over the Eastern North Atlantic. All components run on the RRM grid (enax4v1). All needed input files to run the new configuration have been uploaded to the input data repository. Supported compsets include only FC5AV1C-04P2 (72 levels), but RTM needs to be turned off (xmlchange RTM_MODE=NULL).
Fixes #1357